Skip to content

Backport of Reference hashicorp/consul instead of consul for Docker image into release/1.14.x#17918

Merged
nathancoleman merged 3 commits intorelease/1.14.xfrom
backport/NET-2928-fix-integration-tests/newly-premium-bee
Jun 28, 2023
Merged

Backport of Reference hashicorp/consul instead of consul for Docker image into release/1.14.x#17918
nathancoleman merged 3 commits intorelease/1.14.xfrom
backport/NET-2928-fix-integration-tests/newly-premium-bee

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #17914 to be assessed for backporting due to the inclusion of the label backport/1.14.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@nathancoleman
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

consul:latest no longer exists. We should instead reference hashicorp/consul:latest (or whichever other tag we're using).

Prior to this PR, our integration tests are broken due to the above (example).

Testing & Reproduction steps

Our own integration tests exercise the modified Dockerfiles. They should pass on this PR.

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-2928-fix-integration-tests/newly-premium-bee branch from 9a00ae2 to ed2fc2d Compare June 27, 2023 23:17
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/NET-2928-fix-integration-tests/newly-premium-bee branch 2 times, most recently from 73f117f to ed2fc2d Compare June 27, 2023 23:17
@github-actions github-actions bot added the type/docs Documentation needs to be created/updated/clarified label Jun 27, 2023
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging June 27, 2023 23:21 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 27, 2023 23:27 Inactive
* Reference hashicorp/consul instead of consul for Docker image

* Update Make targets that pull consul directly
@nathancoleman nathancoleman marked this pull request as ready for review June 28, 2023 00:08
@nathancoleman nathancoleman requested a review from a team as a code owner June 28, 2023 00:08
@nathancoleman nathancoleman enabled auto-merge (squash) June 28, 2023 00:09
@nathancoleman nathancoleman merged commit 1473810 into release/1.14.x Jun 28, 2023
@nathancoleman nathancoleman deleted the backport/NET-2928-fix-integration-tests/newly-premium-bee branch June 28, 2023 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants